Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Dec 2011 18:08:42 +0000 (10:08 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Dec 2011 18:08:42 +0000 (10:08 -0800)

Trivial merge